merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 19 Dec 2006 20:31:48 +0000 (13:31 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 19 Dec 2006 20:31:48 +0000 (13:31 -0700)

Trivial merge